projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cde6fe5) | patch
Remove conflict marker.
authorRomain Francoise <romain@orebokech.com>
Thu, 1 Mar 2007 13:58:24 +0000 (13:58 +0000)
committerRomain Francoise <romain@orebokech.com>
Thu, 1 Mar 2007 13:58:24 +0000 (13:58 +0000)
commit404a2a4b527cf3c87783173b13b47a1787dcd6f2
tree7eabfe56429cb91e90b71af07d913303f7d0177etree | snapshot
parentcde6fe5cd0a02cdb697d3d0f3c026e42d9afc7dccommit | diff
Remove conflict marker.
lisp/ChangeLog diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.